A few updates for GTypePlugin.

Wed Nov 15 21:56:28 2000  Owen Taylor  <otaylor@redhat.com>

	* src/pixbuf-*: A few updates for GTypePlugin.

diff --git a/modules/engines/pixbuf/ChangeLog b/modules/engines/pixbuf/ChangeLog
index 38a0b63ad45340768313e3f3ec9df07c0a3246ce..a9170b5c832cc46132525a232cf28133314cc5c8 100644 (file)
--- a/modules/engines/pixbuf/ChangeLog
+++ b/modules/engines/pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 15 21:56:28 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * src/pixbuf-*: A few updates for GTypePlugin.
+
 Tue Jul 18 12:13:19 2000  Owen Taylor  <otaylor@redhat.com>
 
         Updates to work with GTK+-2.0 theme engine architecture.

diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index 9d5449bea0f33f3daad1adad84d98b1c6ff19140..22bb327e825d94352a912bdba567a62083ea77b3 100644 (file)
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -13,5 +13,4 @@ libpixmap_la_SOURCES =                \
        pixbuf-style.h          \
        pixbuf.h
 
-libpixmap_la_LDFLAGS = -module -avoid-version
-libpixmap_la_LIBADD = -lgdk_pixbuf
+libpixmap_la_LDFLAGS =  -avoid-version -module

diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index 67c747f1cafa16d83c8d6a0b6f1751a8935f73f1..8b0db0308c7293b9e0ae18dd469fa67b7627479d 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -1069,7 +1069,7 @@ draw_handle (GtkStyle      *style,
 GType pixbuf_type_style = 0;
 
 void
-pixbuf_style_register_type (GtkThemeEngine *engine)
+pixbuf_style_register_type (GTypeModule *module)
 {
   static const GTypeInfo object_info =
   {
@@ -1084,10 +1084,10 @@ pixbuf_style_register_type (GtkThemeEngine *engine)
     (GInstanceInitFunc) pixbuf_style_init,
   };
   
-  pixbuf_type_style = gtk_theme_engine_register_type (engine,
-                                                     GTK_TYPE_STYLE,
-                                                     "PixbufStyle",
-                                                     &object_info);
+  pixbuf_type_style = g_type_module_register_type (module,
+                                                  GTK_TYPE_STYLE,
+                                                  "PixbufStyle",
+                                                  &object_info, 0);
 }
 
 static void

diff --git a/modules/engines/pixbuf/pixbuf-main.c b/modules/engines/pixbuf/pixbuf-main.c
index be731bbb5e0eb80fb175d224b898f3ef7b6232ec..95d45258691ccc7e42659c0b53e57143d2e7253f 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-main.c
+++ b/modules/engines/pixbuf/pixbuf-main.c
@@ -26,14 +26,14 @@
 #include <gmodule.h>
 
 G_MODULE_EXPORT void
-theme_init(GtkThemeEngine * engine)
+theme_init (GTypeModule *module)
 {
-  pixbuf_rc_style_register_type (engine);
-  pixbuf_style_register_type (engine);
+  pixbuf_rc_style_register_type (module);
+  pixbuf_style_register_type (module);
 }
 
 G_MODULE_EXPORT void
-theme_exit(void)
+theme_exit (void)
 {
 }
 

diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index c221ae1562caa76e3af61bb2a09f8d026f1c93ac..b4c12d3f5943e2884aeb7c69f0de7e8c8d684cb9 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -117,7 +117,7 @@ static GtkRcStyleClass *parent_class;
 GType pixbuf_type_rc_style = 0;
 
 void
-pixbuf_rc_style_register_type (GtkThemeEngine *engine)
+pixbuf_rc_style_register_type (GTypeModule *module)
 {
   static const GTypeInfo object_info =
   {
@@ -132,10 +132,10 @@ pixbuf_rc_style_register_type (GtkThemeEngine *engine)
     (GInstanceInitFunc) pixbuf_rc_style_init,
   };
   
-  pixbuf_type_rc_style = gtk_theme_engine_register_type (engine,
-                                                        GTK_TYPE_RC_STYLE,
-                                                        "PixbufRcStyle",
-                                                        &object_info);
+  pixbuf_type_rc_style = g_type_module_register_type (module,
+                                                     GTK_TYPE_RC_STYLE,
+                                                     "PixbufRcStyle",
+                                                     &object_info, 0);
 }
 
 static void

diff --git a/modules/engines/pixbuf/pixbuf-rc-style.h b/modules/engines/pixbuf/pixbuf-rc-style.h
index 3db0a3f1fef379b6c5f39302b5e2a4883de15502..53d93b794e046f333886df05e4fe50f702055188 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-rc-style.h
+++ b/modules/engines/pixbuf/pixbuf-rc-style.h
@@ -46,4 +46,4 @@ struct _PixbufRcStyleClass
   GtkRcStyleClass parent_class;
 };
 
-void pixbuf_rc_style_register_type (GtkThemeEngine *engine);
+void pixbuf_rc_style_register_type (GTypeModule *module);

diff --git a/modules/engines/pixbuf/pixbuf-render.c b/modules/engines/pixbuf/pixbuf-render.c
index c2f8cf4a202a14b997e875dba857e11b2c0f3198..7674ff14e04738ba50de1971da9859a610b85a45 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-render.c
+++ b/modules/engines/pixbuf/pixbuf-render.c
@@ -212,9 +212,15 @@ theme_pixbuf_set_stretch (ThemePixbuf *theme_pb,
 GdkPixbuf *
 pixbuf_cache_value_new (gchar *filename)
 {
-  GdkPixbuf *result = gdk_pixbuf_new_from_file (filename);
+  GError *err = NULL;
+    
+  GdkPixbuf *result = gdk_pixbuf_new_from_file (filename, &err);
   if (!result)
-    g_warning("Pixbuf theme: Cannot load pixmap file %s\n", filename);
+    {
+      g_warning ("Pixbuf theme: Cannot load pixmap file %s: %s\n",
+                filename, err->message);
+      g_error_free (err);
+    }
 
   return result;
 }

diff --git a/modules/engines/pixbuf/pixbuf-style.h b/modules/engines/pixbuf/pixbuf-style.h
index 43bfc8b7893dcf4f55f1b969d4d5621a502fd8fc..75fc0fd1ad72b070a326ed20a16dca794ded4c10 100644 (file)
--- a/modules/engines/pixbuf/pixbuf-style.h
+++ b/modules/engines/pixbuf/pixbuf-style.h
@@ -44,6 +44,6 @@ struct _PixbufStyleClass
   GtkStyleClass parent_class;
 };
 
-void pixbuf_style_register_type (GtkThemeEngine *engine);
+void pixbuf_style_register_type (GTypeModule *module);